From 6ede23a0e94ab4606b4a70385c673736b6f1ef2f Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 2 Sep 2019 18:17:30 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 465983 -> 466711 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index dc139bd1c17..d400255295b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -869,7 +869,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index 899ffe22099f422bd07a1126dc17aa4c2c2f8465..e02d6c16337090675a3f26b317a0dfc73779c242 100644
GIT binary patch
delta 554
zcmdnLLuUFunT9Ql?^XD?6o4Q)E3qswB|kZKvf^FQ$$U3?bjveKGIU|0I$%X$g~0`>
z$(d=Hsl^H<8L0|T1=B@T7}Z(4fM!g0P+?T&gbFL9OcvZL#^LYctpJmgoW4YbQFHnv
zZ$`!GXT%wW*kLA|Rc2I^2U`=X1F<d|<b-&rylrJ_acuho6-FRt+WtU=`QCAH1>Hmi
zC6&~?#H5_m`23V?B?U!Wg}nUf50^3tPhOYDHU0J*W{>IbxtX}87d&KPg<F;Qf<<P!
z@>^!(=^cMr_@*bkWmcQs^?`|ZdjDHy)yWHZSf+1z%Pc=V%M7Tjz=VZs+FNF^$?1H;
z(=V{G^G+8~XJMJH_KsP6dV>;+*mUoA%!boB%vr=I=kah&??1(?Jl)|k6UVgM%pB8q
zykoYVZqU!hG5za1X2r>?c*UpheFhX)eb1~r{aFr+$aH~c%q)}jxH+aLy$34Ie*l!6
z|DIWL`ZZxTQS;(dE>2LGm*y3xmMC~RhB><UJ9BZSWrBkVNTucgm0+ltzUw`+h5=N$
yXRx~$P?wT|t%4FT2$ifs(U!->iE1X$tmzBiFl)5`f6olWEI`b<{r`J52OR)#FuXYc

delta 233
zcmbQfPiFrPnT9Ql?^W6-s4)UD)Ak8!%;%3!ue;C8Jw10mtI+h@XP70X+g)K6oWAEB
zv;1`4_squAUEVVrOy4=5m3R7w*UYTbyWTU)Oc%Jy%rZUUBaqnio>_c)mNb*dbl$@(
zT+`pbXO^12`UVT%^bK;%9Mc7SnOLW5egG;-s9@rs9{vGn)Qc&sg3}GoFl$f0{ejsQ
z$taDF%#zdn-!k)qOxB&Q_JC1f`r3~`C7(bNX<a~xluyjk(`65`uusnvW8nrny#4wo
RW*}w(V%F`~Ke0LJ0045OT^#@b

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0b63489f05..2d9d5ee6dcb 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 410f8cf8ef1..363a8a41dea 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 03b58fe3da7..63e332079bc 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2